From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 19 Jul 2018 21:50:54 +0000 (-0400)
Subject: moji chooser: Try harder to avoid fallback
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~33^2~31
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=c52d9cfc14009b1821f99e2c9b30534ae164914f;p=gtk%2B3.0.git

moji chooser: Try harder to avoid fallback

We don't want to see any fallback rendering.
The current check was still letting some fallback
combinations through.

Based on work by Julian Sparber.
---

diff --git a/gtk/gtkemojichooser.c b/gtk/gtkemojichooser.c
index 64ec1959ce..68cabda67e 100644
--- a/gtk/gtkemojichooser.c
+++ b/gtk/gtkemojichooser.c
@@ -404,7 +404,7 @@ add_emoji (GtkWidget    *box,
   pango_layout_get_extents (layout, &rect, NULL);
 
   /* Check for fallback rendering that generates too wide items */
-  if (rect.width >= 2 * chooser->emoji_max_width)
+  if (rect.width >= 1.5 * chooser->emoji_max_width)
     {
       gtk_widget_destroy (label);
       return;